bitkeeper revision 1.1159.212.11 (41decdbd8TPAvL-MaZNJDOO3L7L6MQ)

Fix CONFIG_MAGIC_SYSRQ compile issue with Linux 2.4 kernel.

diff --git a/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c
index 78c46675f533815ff8810053a0ba20b209371288..07aae9d0c60d2fb52f52db75ed2c95203dbdd5e4 100644 (file)
--- a/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c
@@ -217,7 +217,11 @@ static void __shutdown_handler(void *unused)
 static void __sysrq_handler(void *unused)
 {
 #ifdef CONFIG_MAGIC_SYSRQ
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     handle_sysrq(pending_sysrq, NULL, NULL);
+#else
+    handle_sysrq(pending_sysrq, NULL, NULL, NULL);
+#endif
 #endif
     pending_sysrq = -1;
 }